From 343ae2c1fd4eb939b318ef95d87cedd4cb940d9f Mon Sep 17 00:00:00 2001 From: robertl Date: Sun, 9 Apr 2006 19:10:59 +0000 Subject: [PATCH] Override our lovely, platform independent build with alots of "if darwin" tests to staticly link expat and libusb so Mac users don't have to fink those packages. Sigh. --- gpsbabel/configure.in | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/gpsbabel/configure.in b/gpsbabel/configure.in index f2ae19c11..db8274bfb 100644 --- a/gpsbabel/configure.in +++ b/gpsbabel/configure.in @@ -52,11 +52,19 @@ case "$target" in [USB_LIBS="`libusb-config --libs`"], [AC_MSG_ERROR([libusb >= 0.1.8 is needed])] ) + # Override libusb for Darwin to reduce external + # runtime requirement. + case "$target" in + *-*-darwin*) + if test "x$ac_cv_lib_usb_usb_interrupt_read" = "xyes" ; then + USB_LIBS="`libusb-config --prefix`/lib/libusb.a -framework IOKit -framework CoreFoundation" + fi + esac OSJEEPS=jeeps/gpslibusb.o CFLAGS="$OCFLAGS" # LIBS="$LIBS `libusb-config --libs`" fi - ;; + ;; esac AC_SUBST(USB_LIBS) @@ -72,16 +80,23 @@ if test "$with_libexpat" = no ; then else # Special case fink test. - if test -f /sw/include/expat.h; then - CFLAGS="$CFLAGS -I/sw/include" - fi - if test -f /sw/include/expat.h; then - LDFLAGS="$LDFLAGS -L/sw/lib" - fi - - AC_CHECK_LIB([expat], [XML_ParserCreate], - AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat]) - [EXPAT_LIB="$LDFLAGS -lexpat"]) + case "$target" in + *-*-darwin*) + if test -f /sw/include/expat.h -a -f /sw/include/expat.h; then + CFLAGS="$CFLAGS -I/sw/include" + LDFLAGS="$LDFLAGS -L/sw/lib" + # Static link against expat archive, not dyn lib. + AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat]) + EXPAT_LIB=/sw/lib/libexpat.a + fi + ;; + *) + AC_CHECK_LIB([expat], [XML_ParserCreate], + AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat]) + [EXPAT_LIB="$LDFLAGS -lexpat"]) + + ;; + esac fi AC_SUBST(EXPAT_LIB) -- 2.30.2